auto merge of #444 : alexcrichton/cargo/issue-54, r=brson
authorbors <bors@rust-lang.org>
Wed, 27 Aug 2014 02:51:45 +0000 (02:51 +0000)
committerbors <bors@rust-lang.org>
Wed, 27 Aug 2014 02:51:45 +0000 (02:51 +0000)
This generates errors for malformed semver versions during the decoding process
rather than later in the convertion to a package id. This also cuts down on the
large number of derived traits to only what's necessary.

Closes #54

1  2 
src/cargo/util/toml.rs
tests/test_cargo_compile.rs

index d205af3af9eb17e4d38880d5e08336702d8c90a1,c7231a609d70328ae1715b52283418b17af227a7..e4ea5ba99007f5b8353098146d39f59de73815b7
@@@ -500,10 -516,9 +516,10 @@@ struct TomlTarget 
      bench: Option<bool>,
      doc: Option<bool>,
      plugin: Option<bool>,
 +    harness: Option<bool>,
  }
  
- #[deriving(Decodable,Encodable,PartialEq,Clone)]
+ #[deriving(Decodable, Clone)]
  enum TomlPath {
      TomlString(String),
      TomlPath(Path),
Simple merge